Index: arch/arm/kernel/return_address.c
--- arch/arm/kernel/return_address.c	(revision 1)
+++ arch/arm/kernel/return_address.c	(working copy)
@@ -59,15 +59,13 @@
 #else /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */
 
 #if defined(CONFIG_ARM_UNWIND)
-#warning "TODO: return_address should use unwind tables"
+/* #warning "TODO: return_address should use unwind tables" */
 #endif
 
+/*
 void *return_address(unsigned int level)
 {
 	return NULL;
 }
+*/
 
 #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */

Index: arch/arm/include/asm/ftrace.h
--- arch/arm/include/asm/ftrace.h	(revision 1)
+++ arch/arm/include/asm/ftrace.h	(working copy)
@@ -45,7 +45,7 @@
 
 #else
 
-extern inline void *return_address(unsigned int level)
+static inline void *return_address(unsigned int level)
 {
 	return NULL;
 }